- Continued refactoring, added CSV support (untested), need to fix xpath test