Would love to contribute. I'll try to put some work in this weekend when I have the time.