Forgot the purpose of that placeholder
Finished the rest of the TODO items