Added instance methods. Tests need to be refactored yet.