all my changes. added assets + added messagehandler
update merge