Start on adding ability to load other PT assets
Remove assets file exit
Quick cleanup
Fix merge