Start work on fix, needs more guards