Bring in ci as subtree
Works nicer with ci