more restructuring; net mixins