CollisionManager added, Code review fixed. Components filled in