Add in scheduler and object checking