interim commit
commit
most of the bugs fixed with xbel loading
Finish Feature-XBEL3