added Calculator import, removed premature stubs