Company code, some fixes, still working..