Bring #347 up to date and attempt to merge with current codebase

[translunar]

I attempted to merge in #347, but it looks like it's fallen way behind the current codebase. It needs some attention from an enthusiastic GSOC student.

[mrahul17]

Hi @MohawkJohn , I would like to work on this.
I have made an initial PR at #580 . Please have a look.

[mvz]

It seems #580 was merged so I think this can be closed, @MohawkJohn?