Port to new Bank class
General Updates