Non-Euclidean Geometry Developed