dev merge

moving code to state design