Turned location information into arrays, so they can be used more
dynamically.
Made changes to read information properly from the info file, added
TODO-s