Updated files as of 3/27/14. Julius add to project