well, without testing this version everything seems to work in refactored land, we will deal with units and stuff tomorrow