Added auto-accept

Very messy commits (failed manual merge)
Heh, probably accidentally removed the indent at some point, then inserted again.