First commit of our work for Udi!  
This involves task 10, 12 and 13. Checked, debugged, and running!