Some more stuff for #16