Third commit. Controller added - not working yet.