GOLD - final commit

ACTUAL final changes - Gold for reals