Sorted some stuff again
New stuff