Add South back in & migrate for sync to upstream