Added a bunch of To-Do's