Still debugging. Committing/pushing this to fix an error I found in the way the packages were organized.