pretty close to working again