Keep fixing bugs, move to geeker for test