Issue26

note: this pull request depends on the module convert pull request. When that is applied, you'll see the diff.