Added some documentation/TODOs