Misc implementations

d556d54 and df8d384 should be the same. I forgot how to git and committed without pushing.