Getting ready for some major re-coding