Moar stuff for #9.