Reimplement addition and remove Coercion.java