Starts a WIP for #33