All working and DB tidied