TODOs and Classes