finished up data functions, moving to render