Going to add back in controls and remove jsapi