started work on meta-class re-write