initial flex box stuff
merged conflicts