Container class.
Functionality moved to class.
Tests rewritten for classic approach.