Refactored hazard detection, started branch prediction