Finally a running version again, event pollers aren't dealt with yet though