Final Version

Uses parser. Legacy code from previous versions commented out