Works! Fixed a couple of mistakes from merging files