First commit, abstracted xml data from view logic