Calculator now uses new binding class