moved more stuff to puppet