Broke out blocks to be separate for planning and dev