Bugfix

Forgot to pass the unique key around to various places ... whoops.