Now generated app looks like what it should, need to do more cleanup