Merge to add control mechanism and console