checkpoint in big refactor
couple more changes for the demo