Completely rewrote Sign support