More work, getting traits to pull correctly.