First pass at adding users support.