Still working on signal handler