still working through some bugs