Tidying and adding back in old stuff