Final Commit

Includes Tests