Customer list, WIP
Fix conflicts