Capturing some TODOs
Starting to add style