Flowerhack/merge ssck and cl

LMS-2858
I would imagine that `LocationBase` would disappear as part of @sarina's changes.