Add todo
Fix: don't print newline
Better messages
Enh: basic tests