Added Numerics. Will start restructuring tomorrow