Work on demo program to pull out commands into its own module