Fixed all conflicts. Will merge with develop once a nicer walk has been made with a decent optimiser.
Weird non-conflicts resolved