This is great! I'll probably want to make a few contributions to this