Updating implementation to add views ;-)