Started collision, not quite right
Fix formatting and collision detect