stgraber made a bunch of commits on this fork already.