Working version.

Pull request is the internet version of a high five :)