Rewrote Add.solve. Resolves #23. Resolves #25.