More merge conflicts. Taking main changes then will integrate mine.
which will evolve over time. stat menu plugin.