Hit the first milestone for refactoring Imp.