Doing exactly the same, plus the fact that I put my NPCs up so that it looks like they do stuff, for instance: Goris in the shower, Myron/Lennie in the kitchen/mediclab (I vary between the two in those areas), Sulik guarding the entrance to the base along with the robodogs, Vic guarding the door...