adding rough draft of touch events
added Ellie's storage changes
fixed merge