Removing unused things from the forked repo. Adding some of my own stuff.