tree 0f80e8cc14263f1b1166d5fcfe9af2e1b12e2a85
parent 9dbe3d9b32b7a3cd862221b4260b44dd341e4cdd
author Aaron Gallagher <_@habnab.it> 1470290865 -0700
committer Aaron Gallagher <_@habnab.it> 1470290975 -0700

Complete the refactor.

I thought I did this, but I guess not.