Added Views. It works, partly.