Resturctured and documented new functionality #103