Redid the code. Bumped Version to v2.0.0.