Added npcs, collisions