finally regexing works. Needs Cleanup