Completed code

Completed code 10/24/14