Initial refactor to put bin into class