Added a couple of todos about architecture