WIP numeric+hint and some tests