WIP and fixups