Added views and updated description
Converting some of the source code