Completed programming assignment 1