Parse in module

Don't review yet.
shouldn't there also be a case deleted here of how we handled tokens the old way?