New geometry struct

Converted over callers.  Some problems.  Needs work!