Tweaking. Need tests for collisions and map locations now.