merged checkpoint with base project.  Some clean up is needed, but the project works fine