The code actually functions as expected now\! I need to do a little bit more maintenence to clean up old code, and then rebase from master and all that jazz