Added auto-accept

Very messy commits (failed manual merge)
wat