Refactor - Cleaned up sample naming some more.
Adding views.
Oops. Didn't want that.
Refactor: Minor rename and changing various variables and their use.