More Chisel mod bandaid patches - really needs a rework....