Refactor and final logic implementation

Fixed blocked transitions
Increased speed of transitions
Refactor of names
Removed redundant logic