Initial class setup started.
Merge remote-tracking branch 'origin/U'
Testing the commit.