#603

Here's a pull request with the progress so far.