Refactored project to allow for GSON conversion, and added event parsing