Next cycle, closes #78 and #86