QuickAdd, and QuickAdd and Warp done. Needs testing