Close #2 and abstract refactor into class