Refactored and continued work on Interval