Cleaning up.   Still setting up the basic framework.