Add geometry question! WARNING: LOTS OF CHANGES

Closes #10