Added Alberto's Fix, Didn't fix everything :(

So uh, it is working kind of. We have collisions now but our models
don't move correctly now. WHAT HAVE YOU DONE ALBERTO!?!?!?!