Refactors to class and adds final look