still working on fixing stuff