we can keep them here now, and refactor this a little more later. I'm thinking like you but it's quite difficult to make views independant right now.