broke out functionality into files. started filling in the 'view' functionality
Merge remote-tracking branch 'origin/master'