Major Update Intermediary (WIP)

Intermediate commit for a major update soon.