Squashed commits to get t-mobile engine going