Added jumping, redid state system