closes #82 - defined signals, incommented the outcommented stuff