Merged hqcode to rushbot