[WIP] Adding decimal support

This is dead code?