Rewrite of the core state machine logic#10

morr0ne merged 6 commits intomaintailwags/sap:mainfrom

state-rewritetailwags/sap:state-rewriteCopy head branch name to clipboard