VERY basic state pattern in setup round. Minor bug fix in MapController