1.4 base

No new functions yet, 1.3 copied over.