Mode control

This is to address issues 6 and 7.