still working through null issues