Locations complete!

Signed-off-by: Ben Leeth <ben@leethdevelopment.com>