Finished configuration, just need to add config comments
Fixed conflict in COCore