Finally decided on a data structure, added initial calculators. Lots of data handlers to delete now that everthing will stay JSON objects once received