parsing works again, now all in a single file