Hi all! In my opinion, this PR is now ready for review. This PR doesn't have too radical changes.