Moved currentstate information to clientstate object