Split out config
Better..