Merge and reworking, part II (Build now can be compiled w/o errors)