Added basic mode / command infrastructure