Further improved Logic Class.

Semi-TDD will begin now.