Mostly a commit to continue working from a laptop.