Awood/sat5 migration

Good code reuse overall.