Moving things around to get tests to pass.