Kinda works but still wierd error message the second time we launch... hmmm