Refactor a bit.  Also get Drible plugin operational which Fixes #10