added more functionality, going through old scripts, currently compiling master file