merged in config from laptop, needs clean up