added parser; need to integrate into data structures