Starting to add interface for shortcycling