work in progress, can see the Add but not perfect