Set up basic structure & added command selection