Last commit before I start screwing stuff up with validation, just to
ensure everything works.