wip.. merge with lightning 1.2?