Feature/not as service

Moved the modifications about "redis not as a service" to a new branch to make it simple to work on other things