Prettied up the code and actually tied it into the data