Added the final things, polished up everything, and fixed a few bugs along the way!
cleaned up last commit