Done programming assigment 2