Replaced solver class with functions.