WIP: yep

Pending visual confirmation. cc @aaronsalmon