Massive refactor and cleanup.  Remove C like arrays