Added deadfactory and moved som content loading