More geometry work