First pass of decreasing Location size

This small change gives enough RAM to draw graphics again.