Feature/now 341

one is for xs only and the other is for sm and above, they are both functional.