Stuff I forgot to commit, apparently