Ghi 6

I have no clue how this should work, so I'm going to start with a pull request. 

Issue #6