End of day commit; Working on some refactors and cleaning up flow, removing event emitting/handling logic. At this point it's just a code staring exercise, need a break