Add signal handling and bare minimum usage