working version, views mostly how i want them