Work on new modelfile parser