Continued developing class structure for Cad analysis.  Slow to instantiate.