Multiple areas of same types are saved now

Had to perform major refactoring to achieve this