database pulls from enviroment
fix merge