Text adventure

Bring text adventure feature branch into master