Initial code merge for 0.1 alpha (we still have to rewrite the quests)