Loads of changes including separate doc
yeahhhh