updated for overhaul, more traditional calculator vor v2