first stab at geo optimization
Merge pull request #15 from calvinmetcalf/geometry-choice

fixes #14