wrapped in class, added regex parsing