Cleared a bunch of todo's. Refer to that file for specifics.