Readded npc.java
preparing for not @ home functions