Added a couple files, cleaned up work