Indoor Trainer Upgrades

Fair bit of related discussion here: