Calculator dev work

more dev work