Add Construction Mode (probably needs testing / fixing)