Updated to reflect latest code status... all code compiles and operates