HUGE update - large amount of collision checking, tests etc