finished wine pt 1
completed todo up to individual views