a bunch more geometry work

i like where this is going.