Oscar Elfving

@anitakrueger did you make any progress on this? I was just working on this today, going to submit a PR when I clean it up.

@anitakrueger OK, I'll ping you in the patch I'm making, hopefully will be able to finish it this week.