Hopefully after this though we can get an "upgrade to Cedar" branch going and put all of this behind us.