Add ui commands. Reshape to use issues (prototype)