Reworking data storage
Email support (error handling) checking code