#30 moved check balances to service