addController, entryModel, lots of minor changes