still working on the unit tests