Cleaing-up and getting the category sending working