Add rlarsen from TriFork