almost have these working