Tons of da changes

Its getting late..