More work on quest system