Removed TODOs
Taking notes for CSS