Move attr_accessor in prep for transition to Location