Major tidy up and prep before the real work begins