Ripping out views into it's own addon