Adding more gamestates and features