Got bored and did some of #68.