Lay down the foundations for a complete rewrite, the new framework is far more easy to maintain