Lots of changes

Lots of code changes + Added more to script. Almost functional!