Implement progressive rendering
Clean up and annotations