Ditched the class idea