First commit for nonflatgram fork