Organization and Small Changes

Probably need an interface after all, but organized a bit. Should
really change to promises as well instead of sticking with co-fs.
Promises I think look and feel better than new generator/thunk
mechanics.