Final push (?) everything is working