committing changed solution user options
getting latest changes and running into a problem with the pull.
some changes made, don't remember the details