Refactored collision in Room, also moved methods around for structural purposes