I think that's a good idea, this branch tried to keep everything as it is in develop right now.