working on schedule
merge stuff