Genesis commit, lots of ToDos