Null values table fully added, may require some further tweaks.