Started refactoring to Adams specs.