continued progress. Deleted old implmentation after moving all usefull code in to new one. Still lots of work to do.