Pull in some stuff from CommandSigns

Needs thorough review to remove needless crap