Change some stuff to get ready to add scripting