[Minor] Checkpoint merge
First pass at parsing "at" context of quickadd