Tidied up. TODO: Work out episodes tomorrow