Update

Completely redone Default.xml to be more inline with PA legacy branch to see if it will build