Got as far as adding some span tags and a little code organization.