Completed programming assignment 2