everything working sans transfer
merge