Starting major refactoring. Will be moving duplicated functionality up into view and cell parent classes.