Reorganised Scirpts, Added a few features, Experiment with room