starting calc logic over again - previous code was total crap