Rename and make more sensible
Add new script