Algorithm now changes 1x to x
Bug remains in solver