Cleaned up, added scheduling, began commenting