add ToDos
changes to clean up and support view generation