Second and final commit until version 1.0. Adding more classes soon!