Working on getting the images ready to go to the server as well as cleaning up templates