Make Thread Safe, Add Sample App