Lots of changes. Also tern. Need to fix that.