finish programming assignment

The programming assignment has been completed.  Code at the end has been commented out that was used for testing purposes.