Updating with the most recent changes from class

Added new classes for the scene management that we're going to be
building upon.