Added faces and started on Geometry