Added beginnings of controls