wip
refactor calculator javascript
fix calc merge