Toby - Renaming things to be clearer and moving some stuff around.