Added some todo stuff