Added all NPCs components - not set up yet
Updated, cleaned up