Re-added locatable so I can do it on backend this time.

These changes should not affect anyone as I've only added an interface and asserted that unit follows it- which it already did. Take 2.