Comming changes before I start screwing with the state system