architecture 'corrected', button lightning is still work in progress