working on making this build properly so I can submit a pull request
removing backup files from commit