Complete rework of how we handle banks