finished organizing class and script