Refactor into class, add list command