knocking off stuff from the TODO