Work ub progress (migrating to new dev-install)