Renamed token to value to be less confusing
All statement types working