WIP: More work on the root side

This is a work in progress, don't pull yet.