Squashed lots of intermediary commits to single commit to reduce clutter.