Calculator sort of works now