Made some changes, but set! is definitly broken