Added some views - unsure if the logic is right though..