still working on getting this correct