Overhaul local manf

Should be compiling 100% now on jf