Initial controller commit