Deleted extraneous files, consolidated code and got a little further