merge
added progress screen with factoid