Completed those TODOs