Moved over correct formula processing code into package