A few more tests and reworking to use brimtext.