rework of collision system, almost kind of sort of there