still working the bugs out