Up to point 2

Black screen, but code otherwise sound.