Final Commit for Issue #1