Adding some TODO

Next step will be to add loader