Feature/calculator premerge