It actually runs now...
Added normalization constants
Tidying up, routing currently broken