Added some todo items that Vuduc thought would be cool