More commenting to constructor. Still untested