Customer model redesign, WIP