add regex, frist functional version