Made implementation more class-y