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 ffaae2d6ce6763541758e1422eb9165db3c28f10```
```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.

I was cherry picking by using this: ```git cherry-pick -x fd97e93980c3916b6be5bc48774afea10d6fb4cf```.. started on a branch off master, then started at the earliest one for this. the -x retains the author and commit message. It works really well!