Adding basic control functionality