Some interval work
Merge origin/master