Moved things around a bit, about to remove Scalding, about to refactor Args