Working on #8, needs long-term testing