Soooo many changes, i cannot mention everything.. so at least at this version, everything is working except unit tests.