Moved more stuff to scripts