Updated Parser and create a test model for myself to debug my parser