Updated most of the re-writes. Still need to sort the results out into a more coherent strcuture
Updated files and resolved conflicts