Ca engine

Going to try this again to try to avoid the extra merge commit.