still stuff to fix