First commit - Scripts for 2nd architecture