Adding more to the todo, fixed a bug with manifest not grabbing saved values