Had to redo, smart git got stuck on a merge. code finished not debugged