Started the rework featuring error handling, and a sneak peek of the future implementation.