Finished the new rendering system for the moment - some visual bugs remaining