So very close to have this working