Cleaning
Add sketch of new Interval stuff

Related to fixes of #41, #40, #29, #25 and #24

TODO integrate with previous code, test and cleanup