7/24 commit
Added calculations functionality
work on calculations