dev stuffs
Segment finished and also closes #2
Merge branch 'oops' - failed to pull first :(