Serializable locations

So many lines less