Initial work
Added splicing
Added small fixes and unittests
Merge pull request #124 from jaytaph/wip/datastructures

Wip/datastructures