created a new branch with the rebased code

from this working version I need to add fuzzy control