used regex like a boss, working ok now