WIP - work on supporting old/new-style LBS subclasses