First working version for a couple of installers
Need to create pluggable version next