Done implementing now. On to testing! And I still have to run pylint et al...