Continue implementation of first draft of new editor including existing edit functionality to add server side calculations