Some regex and error handling work has started