Updated PR - I wasn't sure as to whether I should update the docs links or not - even though the pages don't exist yet in the majority of cases!