Move logic to separate module
Add a watchr test script
Stop coverting to Text