Added so many new methods - still untested