refactoring scripts to do more things
time-boxing things