Start tidy up, moving towards more robust callbacks