more WIP changes (conversion to mixin done, schema issues present)