More fixes.
Start working on testing.
Toss internal stuff in its own package.
No more printed output.