More work on #31, still a scope issue there

can't quite figure out how to get this to work.