adddoctoractivity pretty much done now, just need to do field checking, also merge conflicts suck