Added some signal handling, very rudimentary at this point