Quite a few changes. new branch for littlebird as these changes require plugins.