Start working on media upload
Start refactoring of stores
Continue stores refactoring