Got the state features in and working