Fix one bug, working on another.  Disable some code.