WIP: Beginning cleanup of the new iteration, improvements to collision handler speed