Cleaned up existing code, added BroadcastReciever for wifi connections and stub for event service