Refactor to SuperBass class