[trunk] Further WIP for location based outputs