Moved stuff over to scheduler. #8