Lock view attempt2

Pulling everything back together.