Added address to account and contract

Contract and account now both have an address field or method for the
sake of simplicity.