Misc additions, should I implement new event thread?