Working on getting everything functional in CI hopefully