Removing TODO; only had a few things, which I've now implemented