Finished adding the state, base WIP