Add flatMap target. Start work on supporting two apps