Updated to allow saving of locations.

Still contains unsafe instances that may stop the program if input is
not an integer where requested