Update readme and add todo's to codebase'