General engine revision and trying to get collision to work.