Refactored and testing this commit.