added location class shell, moved stuff around