Merge working
Config almost complete