Initial implementation of housekeeping
Missing from previous commit
Little fixing up on the housekeeper