This seems to collide with #212. Do you mind sorting out the merge conflict between the two?