addes classes and assets, merge done