Added some TODO stuff