SOS system done. Fixes #15 (again!)