Organize. Special commands in progress.
Update LineNumberTest
Changed structure slightly.