Work applied

Novaxml now using other analysing method. Needs cleaning