updated event creation stuff.. almost works