Moved function to a new class. View updates
.