Added the logic for importing the quests
Moved some stuff aroung