Added views, updated code.