All tests updated to pass. Might need a review.