Added some global todos