loads of updates to make layer-cake completely plugin based