CN - More work on changing things to use fixed point maths rather than floating point.