Add some options and work on race (long way...).