refactor continues on invocation;
interim commit - pausing for the night