last commit of first version of saltsolver, now working on saltsolver 2