Refactor to common/client packages
Only fire picked up notification once per stack (in case of multiples)
Various tweaks, kind of fixed autoplaying
Un-necessary doubling of code