20140825: Cleaned up and added stuff from internship this summer