May be final code 4 today. Reorganization of code, and some testing
stuff added