Adding generator scripts
Pulling changes made on other machine
Adding controller template