added todo
added dummy UncaughtExceptionHandler