i would say the functions that do something (add/remove/set locations) + all supporting functions could definitely be moved. things like the location property probably should stay