Rearranging some code to prepare for the address display panel