refactored project, also started framework for parser