Loading mask

Addresses #596 & #477