Add Calculator Function / More Dry