moved some more stuff to the base