refactored, streamlined, not working yet
removed git rm
edits
cleanup
refactored