Added phase + fixed a bug with makeMove