Collision and gravity implemented. Closes #3