Worked some more on the custom render