Just about done. Still no random mode.