[WIP] - Signal handler