Hook up persistence; files forgotten in last commit.