Added some extra XML structure, will continue to work on it.