I squashed all the lil' diffs making this work into one "big" commit >:)