Mostly finished moving everything to cannon.js