The project is working at this stage,  have converted a few more stuff to templates (print and matrix operations)