Commit new class, new methods, refactor code