Added scheduler template, restored some lost work