Add Tests. Finish Static Pages