Fix nightmare migration mess, start using branches