Finished the mini-TODOs