promote from brownfield, clean up, add tests