Add additional methods

Added all of the other methods that I could find.  Also refactored so that each method is usually just a single line.