TODO: Add list of things to do