Add more work. Trying to clean up interdependency.