Cleaned up the details, working on the regex part