new controllers+some of Kuba's work on views