WIP for 39. This is crazy!