A lengthy TODO on things that I should do...