Tags added, still buggy