Improve the mechanism via which we handle numeric data
Add a basic test