Added some to-do's