Refactored
XML output
Testing