WIP of simplification, not much actually done