old changes
merge of old code, already had a little fix for the bank checking