Started adding ability to customise classes