Class editing almost complete