Some unfinished work on new features.