Finishes admin work
Begins work on views