CLEANUP: TODOs
FEATURE: Further work changing deps to paks