Yeah, concur on both counts. Lets merge this!