Factor out stuff to seperate scripts
Rename