Forgot to add merge to at-media
Use reset! instead of swap!
Extract regexs to their own defs