change if to else if
finished debugging move rules, and added collision checking