Refactord collission code, so origins were more sanely set.