Made app state simpler. Done with first pass on article additions.