Added basic calculation infrastructure.