Adding some todo's and a touch of documentation.