major refactoring or parseservice