One part of my big change :(. I will add more tommorow, now you can make commits ;)