Cleaning up and getting partial to work part 1