With unit tests (not passing)
Unit tests passing
Updated constructor
Further cleanups to comments, etc.