calculator service and shapes
added code/changed controller.  need to rename