Cleaning up and Operational.

Need to change version number, then this part is ready for a release.