Reimplement division & addition without java method overloading

Existing addition & division tests still pass.