ready for testing, then hopefully packaging. V2 should account for content reflow