Added auto-accept

Very messy commits (failed manual merge)
Uhmm, where is another property? The comma is asking for another property there.