WIP: push ing the LVish refactoring through step by step