Issue 458 -- Store groups & apps before executing updates

FIxes #458