Finished Code -- Uncommented