Added buggy collision detection with NPCs
*Note: It seems pretty good, but I got stuck once.  I will be testing this further