Jeff - try to eliminate some long methods