Apothecary poco cherry

Hey @bakercp .

Got a cherry picked repo here ;D!
I believe I got it all and just missed the libs, just going a build now and all working... so looks good, just without all the libs.

Not good idea to merge directly, maybe rebase your branch to the tip of the cherry picked one?
```git reset --hard ae730a006e0068a197030c73c913d388a69315d3```
```git push -f```

I've got a backup of yours as well, but take another one of your branch as it is, just in case.