WIP for issue #130

Started building out r7rsEnv