Better formatting, further work on the collision algorithm

Algorithm is still not implemented.