combined ATM and retail layers - closes #38