Cleanup on collision system, prep for movingObj using momentum instead of change