More code changes

Always preparing for parsing, actual parsing not started yet :/