Calculator now works