WIP
Simplify logic significantly