Added rendering strategy classes
Removed the old rendering method
Completed updating the rendering
Completed updating the rendering
Fixed minor issue that cause JSON to break