Oh also it's broken b/c dataManager.currentLayer no longer exists...