A few changes, removed old stuff
changes #2
# class