Jacob branch

The calculator should work by now