Some initial XML Logic + Layout
Merge branch 'origin/master'
Breaking stuff with XML. Always fun