Initial work on Master Mode.