still working through bug