Some mods to regex attempt; no real luck