Refactor.

Commented out the tests for now.