pre-merge fix
Merge branch 'Backend'
Finished XML Loader

Testing still required