WIP: Update to use direct deps. instead of peer deps.

even with, won't work, see comment above