Added a couple TODO's