Refactor + Npc heartbeat movement and bounds