I might not have this ready in time for tomorrow's poll since I'll be going to TCAF, so here's a wip.