More rigour around contexts - added build and cmd