Refactor: Still kernel classes need metaclasses and some plots are broken