Feature/configuration

Configuration is good enough for now