Commands, views and stuff (have fun fixing this commit, Luca!)