Cleaned up code, added current 2 xml files