Fixed really sketchy inheritance, TODO: only add signals to ONE state