WIP Continue exploring toward new design.