Flexbox

PR to consider merging Lex's flexbox work into master