All three view controllers are created and subclassed
Merge remote-tracking branch 'origin/master'
Some Preliminary Work on Preference Manager