Re-working geometry

Re-writing it to be readable and to be better documented