Tidying up and starting to extend the handler