New methods added as well as more testing code.