Half-way through media queries

Will separate into better hierarchy once finished.