mixin tweaks--gotta refactor out the god damn magic