almost have this working again...