Got basic calculations working