Added new class for later functionality.