Initial Render Code pass... JAVAAAAAA!
Merge remote-tracking branch 'origin/master'