Filled out TODOs