Did some work on auth and views