Major refactor. Almost done.
Major improvements, Promises seem to be working nicely, but DCI is still flaky.