Attaching documents everywhere

Not as much refactoring as I would have liked to do.