merge in for issue #13

need to merge for issue #13. there is some sloppy code right now with the calculation classes. will clean up after split by line items is done