Added some TODOs
Removed the second button, will add it back when its actually needed