WIP on Customer views