Functioning, but needs cleanup

This all works pretty much, there are still a ton of comments though. I also need to make sure I get rid of anything specific to the Koyo.