Unfinished Business (WIP)

These changes are partial, and this code also does not compile.