A bit more configuration, still not done but should be ok for now.