Interim checkin (some temp testing hacks remain)