Implement issue scheduling

Please see description of the two commits