Update datatypes and masking. Almost there!