still not done, but im halfway! er, I think...
let me know if i let in a glitch or two during my update
