Actually just talked with Laura about that, and she proposed something that will be much better. New commits incoming.