Removed events, added store function (currently recursive, may change)
Merge origin/master