starting to make changes with parsing structure