Great work OP.

It would be great if you can maintain it through the different patches...