moved Calculation out of util/ and into additions/ for cleaner implementation