Work in progress. I'm guessing nobody will see this right away. If you do see this and you want to submit a pull request... Go ahead I guess :)