I think it's working. Going to merge with small_updates to do further testing.