Starting point to rearchitect this file