Lots of changes. Plugin system and inject services working ...