Reorganized structure, compiles fine.  Commented some code.  Now need to
go through an optimize includes.