Fix the rendering code, made new render system
TODO: clean it up!