terminal and command classes working
Merge branch 'iss11'