Some tidying up, prep for more...