Security added, but not finished