first fully working version using new system.  removed lots of unused junk.