Changes from "late night" coding session.