Swapping from guid generator to passing one in
Removing events as I don't want worry about them yet