Added Location and Additional Info Scaffolds **Unfinished