Adresses #1526 - Refactored into backbone model and view.