Ember with proto

Contains all changes from #2303 with the exception of adding assets