Changed function names. Added solve function.