Adding adding, mul, functions; adding tests