move stuff to be smarter