Refactor output from calculator; Add ouput data structures