Checking in the start of the re-architecting of Elision.