Pull request for Issues #9

Pulling in changes for Genie sandbox.