Updating docs
Adding some TODOs :(